Revert "Convert GtkEntry to indirect rendering"

This reverts commit 8e29222d95449278d66f3e067d7dc1dcb7f6dcae.

This needs more work - spin buttons need to be converted at
the same time, and we should make sure that text still appears.

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 3227d47e33e0e76721065b9c97f3bec1ec01fc2f..2f915973551eee154be77af86bf0393f99303ca9 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -414,8 +414,8 @@ static void   gtk_entry_map                  (GtkWidget        *widget);
 static void   gtk_entry_unmap                (GtkWidget        *widget);
 static void   gtk_entry_size_allocate        (GtkWidget        *widget,
                                              GtkAllocation    *allocation);
-static GskRenderNode *gtk_entry_get_render_node (GtkWidget   *widget,
-                                                 GskRenderer *renderer);
+static gint   gtk_entry_draw                 (GtkWidget        *widget,
+                                              cairo_t          *cr);
 static gboolean gtk_entry_event              (GtkWidget        *widget,
                                               GdkEvent         *event);
 static gint   gtk_entry_enter_notify         (GtkWidget        *widget,
@@ -761,7 +761,7 @@ gtk_entry_class_init (GtkEntryClass *class)
   widget_class->unrealize = gtk_entry_unrealize;
   widget_class->measure = gtk_entry_measure_;
   widget_class->size_allocate = gtk_entry_size_allocate;
-  widget_class->get_render_node = gtk_entry_get_render_node;
+  widget_class->draw = gtk_entry_draw;
   widget_class->enter_notify_event = gtk_entry_enter_notify;
   widget_class->leave_notify_event = gtk_entry_leave_notify;
   widget_class->event = gtk_entry_event;
@@ -3591,11 +3591,13 @@ should_prelight (GtkEntry             *entry,
   return TRUE;
 }
 
-static GskRenderNode *
-gtk_entry_get_render_node (GtkWidget   *widget,
-                           GskRenderer *renderer)
+static gboolean
+gtk_entry_draw (GtkWidget *widget,
+               cairo_t   *cr)
 {
-  return gtk_css_gadget_get_render_node (GTK_ENTRY (widget)->priv->gadget, renderer, FALSE);
+  gtk_css_gadget_draw (GTK_ENTRY (widget)->priv->gadget, cr);
+
+  return GDK_EVENT_PROPAGATE;
 }
 
 #define UNDERSHOOT_SIZE 20